projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 944df51) | patch
* smerge-mode.el (smerge-auto): New function.
authorDan Nicolaescu <dann@ics.uci.edu>
Mon, 14 Jan 2008 07:38:05 +0000 (07:38 +0000)
committerDan Nicolaescu <dann@ics.uci.edu>
Mon, 14 Jan 2008 07:38:05 +0000 (07:38 +0000)
commitba463d9eca5f05817eb843372ebc9e46ecbb471f
treebc0b28bf00715380c7a0ea0d59e1bcbc6a1e1e48tree | snapshot
parent944df51178e5c6617e89d28a2e6797b02550fde0commit | diff
* smerge-mode.el (smerge-auto): New function.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook):
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
(top-level): Add a Todo list.
lisp/ChangeLog diff | blob | history
lisp/pcvs.el diff | blob | history
lisp/smerge-mode.el diff | blob | history
lisp/vc-arch.el diff | blob | history
lisp/vc-svn.el diff | blob | history
lisp/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.